lib/checkout: Rename disjoint union, change to merge identical files
authorColin Walters <walters@verbum.org>
Fri, 8 Sep 2017 21:07:45 +0000 (17:07 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Wed, 13 Sep 2017 19:19:33 +0000 (19:19 +0000)
commit051cdf396c4e2aed6fc1aad74dbf4d1a064b72d7
tree3077f968b545dfd9855e979e01493cec27d191b2
parent8d3752a0d6034b378724134277e0fa1004591bb6
lib/checkout: Rename disjoint union, change to merge identical files

It turns out that librpm automatically merges identical files between
distinct packages, and this occurs in practice with Fedora today between
`chkconfig` and `initscripts` for exmaple.

Since we added this for rpm-ostree, we basically want to do what librpm does,
let's change the semantics to do a merge.  While we're here rename
to `UNION_IDENTICAL`.

Closes: #1156
Approved by: jlebon
bash/ostree
man/ostree-checkout.xml
src/libostree/ostree-repo-checkout.c
src/libostree/ostree-repo.h
src/ostree/ot-builtin-checkout.c
tests/basic-test.sh